ElectrumSyncClient: Skip unconfirmed get_history entries#4341
Merged
TheBlueMatt merged 1 commit intolightningdevkit:mainfrom Jan 23, 2026
Merged
ElectrumSyncClient: Skip unconfirmed get_history entries#4341TheBlueMatt merged 1 commit intolightningdevkit:mainfrom
ElectrumSyncClient: Skip unconfirmed get_history entries#4341TheBlueMatt merged 1 commit intolightningdevkit:mainfrom
Conversation
|
👋 Thanks for assigning @TheBlueMatt as a reviewer! |
TheBlueMatt
reviewed
Jan 23, 2026
Collaborator
TheBlueMatt
left a comment
TheBlueMatt
left a comment
There was a problem hiding this comment.
Would be kinda nice to have a test for this, but I'm okay with that just living in ldk-node
|
👋 The first review has been submitted! Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4341 +/- ##
=======================================
Coverage 86.78% 86.79%
=======================================
Files 158 158
Lines 102788 102788
Branches 102788 102788
=======================================
+ Hits 89206 89210 +4
+ Misses 11236 11232 -4
Partials 2346 2346
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
tnull
force-pushed
the
2026-01-electrum-improvements
branch
2 times, most recently
from
9f3970e to
ac0dba3
Compare
tnull
force-pushed
the
2026-01-electrum-improvements
branch
from
ac0dba3 to
115ab6d
Compare
Electrum's `blockchain.scripthash.get_history` will return the *confirmed* history for any scripthash, but will then also append any matching entries from the mempool, with respective `height` fields set to 0 or -1 (depending on whether all inputs are confirmed or not). Unfortunately we previously only included a filter for confirmed `get_history` entries in the watched output case, and forgot to add such a check also when checking for watched transactions. This would have us treat the entry as confirmed, then failing on the `get_merkle` step which of course couldn't prove block inclusion. Here we simply fix this omission and skip entries that are still unconfirmed (e.g., unconfirmed funding transactions from 0conf channels). Signed-off-by: Elias Rohrer <dev@tnull.de>
tnull
force-pushed
the
2026-01-electrum-improvements
branch
from
115ab6d to
cc1eb16
Compare
TheBlueMatt
approved these changes
Jan 23, 2026
Collaborator
|
Backported to 0.2 in #4344 |
Collaborator
|
Backported to 0.1 in #4343 |
TheBlueMatt
added a commit
that referenced
this pull request
Jan 26, 2026
[0.1] Backport #4341 and cut 0.1.9
This was referenced Jan 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Electrum's
blockchain.scripthash.get_historywill return the confirmed history for any scripthash, but will then also append any matching entries from the mempool, with respectiveheightfields set to 0 or -1 (depending on whether all inputs are confirmed or not).Unfortunately we previously only included a filter for confirmed
get_historyentries in the watched output case, and forgot to add such a check also when checking for watched transactions. This would have us treat the entry as confirmed, then failing on theget_merklestep which of course couldn't prove block inclusion. Here we simply fix this omission and skip entries that are still unconfirmed (e.g., unconfirmed funding transactions from 0conf channels).